Removed unneccesaary saving... for now