Added code to correctly order checks...