Refactored (changed Bentleysoft to Pdiveris)