done I think? finally? until tianyu comes up with more tomorrow