changes acccording to the comments from Dima