Trying to fix shit mk. 2