Improved state detection
Updated SharpBlade