Passes the basic tests most of the time again