improved
Low PZ warnings
moved to proper location