changes from SDNUG