Revert Some NOT WORKING