removed a little 5 +5 bug from code
new draft on athe newFeature branch