[Resolved Comments] updated features as well