Few line changes