Moved things around, added a useless option.