Logic updated for Zdei