Small modifications and adding some more details to do