Made saving optional