fixed saving to not use dumb things, perfrmance is better