Added SI to fit
Fixed surface