Some cleanup and add pass duration to response