Added users cleaned up for Chris
merge conflix