feature finalization after testing