Added Completed alert and some logic.