yon
committed
on 07 Apr 02
minimized number of queries