Changing to 17 and adding some logging with total