Final fix to the SST model.
Fixing conflics