moved all the Leader declarations to one place and replaced Leader s with Leader w for save