Top changes. Removed the time consuming querries