Add count column
move code order