jk, now im actually doing what I said in last commit