updated for user actions