re-organize continue + tweaking configurations