Fixed completed message;
Implementing diagnostincs