Added count and simplified design.