Updated smp
merged changes