updated for COUNT