Improved master method.