Handle mode gathering a little differently