new Implementation from Jenkins1
merging my feature!