Changed:
- many sql queries