merged osprdaccess stuff