... took care of implicit points and justification todos