v2.3a -- Further revisions done