Jonathans updates
merge