Changes suggested by bobthecow