updated for pixar
Merge branch 'pixar'