Completed changes to Engine class