Improved logic, reduced complexity