Those three lines wouldn't need to change with my proposal from above