adding save ability
cleaning up