Updated with latest method [ci skip]