improvements

Change-Id: I024f833ed3e2e03f27544b97ed5d491bb65d98b1