Couple more tweaks based on Mum's feedback