Make it elastic Part1