Shannon - added some more changes