made some dubious changes, may have broken something