Manually merged stuff Carl did.