Finished changing `active` to `current`