Fixing up and more analysis