still working on PA1… improvement needed

or some bugs hidden