Fixing to version 1 of Q due to major changes in 2