improvements

Change-Id: Iadb056168f78e6fef3c54d8c01ff08ba7235080a