Add some more analysis :P