The code was adjusted regarding to your coments.