Change methods to have count