Some of my modifications!
