potoFlax with new Path
Merge branch 'potoFlax'