Debgging in progress

Change-Id: Ifeb4bc03611505b9015d095ab0821611b62321a0
updated

Change-Id: I4786aa868ed408a1b55549cc1266eb4616e3af2f