change structure and faster user_act search