Fixup of elastic stuff
More elastic changes
More elastic
More elastic
Elastic Fixes
elastic
More elastic changes
Elastic Cleanup