changed stuff not tested