Switched logic+condition tables to one table as per issue #1