iron out the wrinkles
switch for legacy in modern
build