Data structure improved.