added user_timeline and user locking