Hopefully the final commit from the instructor