Added changes to Main, Position and State hash