merged design from kenny to sourcecode
--> better integration needed!