Improve zones and story