updating with johns advice