merge with sevogle changes