Fixing to use request params