added some stuff
fix merge