small changes in helper