Significant improvements

What a hack!