Added PW functionality