making code not specific to pslc-db machine