Working on BLN

Change-Id: I01cc6bbdf7d73cef3e4a06703996ea818726139e