New sql, should fix issues.