Cleaned up and added nr or users