advanced settings with skyrocket in mind

Change-Id: I9d363553397f7b5cd1c8839d806354b1930693a8