added some stuff and took some stuff out