Change to just pass in the counter element instead of creating it + Minor changes