GOPed up logic

https://ift.tt/2rKa7k4