models/original: updated to use query