Added some stuff for better life

Change-Id: I60f27c910d7497d14885738e4d6ae940eb8a05a6