Updated verification and saving