got rid of and added some stuff