changes according to the comments