Tools & Controller update