complete new desgin / code optimized
litte code changes
little code changes