cleaning up and added filtering of SOF for testing