Enhancements 1 completed except switching users