Design improved in many points!
- See diff.....