Updated figures
More from refactoring of sensors
Refactored Sensors