Tweaks as per maggie