added users and shined it up