almost there. hopefully last bug