Merge Jebbs updates