fixing broken merge
So Tired. Trying a new filter in the morning based on Aleds new code. Just please let it end