tiny adjustment. before REFACTOR