re-structuring in process, broken code