small modifications in helper file