standalone re-write FTW