Added smp compatibility!