changed hard-coded part