Final commit with appropriate remarks