@esoergel can you look over the elastic stuff here?