merged from Tuan, update delegating calculator