Updated Hotspot Model and Controller