Missed some hotspot stuff when porting this. Opps