Added small changes for branch - Khang