Refactor, create PVaraible