Some small changes in feature2 branch