added nolimit option, radio buttons