Fixing the whole fucking program ...