hotspot working and rearchitectured