modify to Patisco Version