Carry forward re-design and bug fixes