removed kai's old stuff