Design issues adjusted