rewrite with features version 2.0