improvements

Change-Id: If15e1aefd7a481291100d836ca6d0a835e2f7817