Made Changes (suggested by Walter)