Engine selection moved to method