made some generic changes