The change also passes the tests.  Any comments welcome.

Best, Arash