More prompt customization.  Need to rethink logic for right prompt