calculate-assemble + fix