Teaching the Mass to upper juniors