made stuff more explicit