this way it's easier to see which part of the code is used where Change-Id: I7d727263383ec1d6d61dd31fcfebf4a4b1a04765