Implemented improvements and forked original.

Implemented improvements and forked original.