Revert back to abstract