changed first user to a variable.
merge branch
updated missing variables
Removed .orig