Changed logic for when calling when, the entire arguments is attached to each item in when.