Refreshing forked version for upcoming 3.0 release