Changes in both the files by Nitesh