view change stuff
fix merge