Addressing the comments from position keeping patch