Updated engine - main