I'll try condense all these matches a bit more, should solve these kinds of things