TODO for down-time implementation