Updated my files to work with changes made.