1.1 - minor changes, made code more concise