Get the logic right...