Don't need the Delay here anymore due to the new checking