A lot of re-work, refactor... magic tricks...