Pad : Performance improvements and more dry.