Changes re: structure of warriors and island