Reverted the logic fix (it was illogical)
And moved some logic around for improved logicity and less crashing