Tweaked previous merge