kibbin - redid this thingie from 2 years ago because Takumi...