Major changes getting engine surfs to work