PROJECT: q.h changes