bug fixed
moving data structures to common