More changes, added elastic again...