pull jonathan's changes