:+1: I get the logic. Please squash the commits and then this should be good to go