adjusted to avoid overhang issues