Added Hetalk's requests