Incorporated Jan's feedback