Lets try some new logic