Restructured the methods used for pauseless marking.