Putting the better silly logic back