Tweaks to Combined_Gavin.dia.