I'm probably a lil late to the game here, BEFORE & AFTERI like the upgrade.
You're on the right path here!