Step 2: fix the uniforms