Greatly simplified broken logic