Refix all for install - STABLE CHECKPOINT!