hrmph, better logic