made some changes data structures