System re-design