added new logic for user activeness - need to improve