merged in active users stuff