re-design

… after having a closer look on the given examples