code optimization, vault snap points added