removed warnings
Finally completed :-)