working commit, fucked up solved, i hope

was a wrong merge, my bad