Updated some code for the past two commits.