Should be much faster than before? (no need to test, just in case you did :-))