combined Project with the new version fo genesis