some lines added :-)