Latest updates from @jvcleave