tweaking readQ
merging with master