Update PS

version 0.2: many changes