Fix for help
Fix for backwards compatability
Working now