latest update, Q1 now working