Update Main
Refactor & Update State