yes this should all be changed to singular