refactor, added stuff for new users