updated to 1.9, new sql templates