Updates after feedback from @andyberry88