refactored quads provider