redoing squashed work in user test 2