add, improve queries. improve speed issues..