8 Commits (fix/sql)