rebuild for two position versions