changing to work with package