jonathan's changes