Final commit with all the correction done