okok: fix the whole shit!