Chopped and changed some stuff around