Adding another set of changes. Now vim looks better ;-)