Make it elastic Part 2