Reverted to old method