pushing Jay's changes; covers #1 from charles' email