A much improved sim