Added method count and changed a bit the order of the sections