rewrite it

#17 didn't actually work