update mass tracing--now works for basic cases