applied Jan's feedback