Some of the changes asked by burt