changes issue no 18