Reverted back the INITIAL save temporarily