Reverted to original code