Changes form zak and tyson and changes for style