Updated to working version

Just modified up to latest PW version