added more data structures, nothing fancy