latest improvements

Change-Id: I30f4c8191c50e2099fc39e7a7a1b7717be47b928