some super duper changes