Revert testing code :|