Included all JJ's comments.
wlozona praca