Still working on weird states ordering thing