feature Users Condintion refactory & code optimization & bugfix