Overcomplicated reworking process. Reverting