cheating saving
merge fix 1
merge fix 1
slight cleaning