more changes from featurea