updated, er rewritten to 0.9.5 TS