some new stuff..

Change-Id: I8125d1b101ce0c3fc9e126979c9b606111e5d104