fixed issues resulting from the reverts