gcbeard made some more modes to branch topic1-gbeard-haib