some changes from parental advice :)