Save 6

reworking functions