Updated to compile with the current version of Q