Working on BLN

Change-Id: I74db61b84fd5764eec20efd009e0868394fa546f