change some code in helper