Think I've merged all updates