im sure this is a bad commit..but for the momment...