Small changes from Shaun Thomas