Don't fail on conditional commands
Less restrictive function names