Temp commit, seems it's still working as it used to
More fixes, might work now but not sure