Changes made according to venkat sir's project code
Merge origin/master