reverted to older code