Transitioning to Janice's webspace part 3
Trying to fix conflict