Jennings' latest
fixed merge issue