Added uniforms and start of picking command