Reworking decision logic