Add comments and check that ordering doesn't matter