making generic changes and hope there is no merge issues