restructuring started, io added