updated some broken code for current schema