[DNM] Make signals work