Reverted to original version