some diagram and fields changes