up to date with original QSTK - Feb 16