solving compatibility except ofc loda new data bug
merged new version