Added some more "logic" hah