Adding back logic.