Continuing implementation of -you signal too- section