Full HA final

Full HA and improvements