removed unecessary saves to increase preformance