Improved Quaquack