Mostafa comments functionality added