Update to working in Head State