Worked on the stretching functionality