Code update to remove find method