gcbeard made mods to branch topic1-gbeard-haib