regen with bikeshed fixes