Refactored to use scisoftpy properly