debug modus integrated

Change-Id: I604c58c8c5d5b8678b219666ff586dbb35ab627d