Updating SOF file from Danny's changes