better handle user added