changed names and fixed count