made some changes by vajira