Performance improvements and better camera placing