updated/filled-out controller