Initial pwsafe optimization