Changing to allow module uage