Modified methods on 0.8x with the new approach