more controller/repository updates