changes to adjust vault problems
merge