add Q to almond wrappers