plan update
improved usage of functional features