#2 - migrated more files to MySQLi