Easier Q import - issue 54