using User object now
merge master into local
using User object now