Some changes made to Engine