working on missing pw behaviour