Changed the uniform system to allow per-task
Tmp