[Experimental] Cleaned up the requirements, added FIRST_NUM_AND_ANY_NUM
Info for developers: This commit changes the FIRST_AND_ANY_NUM to a "First 1 and any #" mode