Reverted to the original version