Added options + moved to pre-save