Updated - continued implementation of user activation