updating to what BSydz has done

Change-Id: Ib7b452ff02b8b1c619afeb09d47c4b044bb9a645
updating to what BSydz has done

Change-Id: Ia00456bcaee6da9d2b83f1b6836bb168d8af6d22
updating to what BSydz has done

Change-Id: I8c59750c261169b9845c8ebadf4588c62672758a
Revert "updating to what BSydz has done"

This reverts commit 2bc4e1a363d7cd70bece1316c510f590da11d5b7.
updating to what BSydz has done

Change-Id: Ib0612cf3b392e5b7f7ed8500107b1f1328fb611c
updating to what BSydz has done

Change-Id: I5ca0231ac10ece6f84cbfb079ee38837cddca9ef