Done more on diagram