more updates; fixed duplicate controller call