New patches with my design from @slowdeathbr