more innard swapping