final changes to elasticity
fixed merge