Update on the singer and album controller and model