Reworked some quantitation methods