General Version Improved

Added new features to the fastest planar version