merge jon's changes