major changes inculding adding users