Final changes

Change-Id: Ie05a58364bbd83f2158de61421d591c7dd9c10c6
Signed-off-by: kecinzer <kecinzer@gmail.com>