part 1 of user-panel update