version with fixed stuff
resoved conflict