[TASK] Rebuilding some stuff