let's try this with a combination of the two files