sbt and surround improvement