Checking in the missing file and optimizing the code