WOrked on the comments