--forgot one thing on the logic