Patched setup for u and p modes
Documentation
upgrade with modes