2nd part of expanded toggle obeynes :D

Change-Id: I7ff22741d3fba25d43814847589cb0a27c7877c4