Added more waves and formations