Added logic for rev swap & smash check