Some fix and add preifx changer