prepared for pf
updated
bugfix