partially fixed
wtf