Applying most of supervisors commentary