Improvements

Change-Id: I261f8abdde3aae5b2b20ca7948a2b8fb9a9ea75f