more work on current user features