More bliss

Change-Id: Ia2ac93bca5f84f8a87d90ac60e005732e6f68947