Update due to review - needs squashed