Adding buck completion