Now saving what it should