Just some thoughts (part 2)

Change-Id: Ifbd76b0edc24a2663d49139c6c25d6c34e68d283