bug fix and rename to user