Updated for stretch support