More torch goods

Change-Id: I8c012f5c0088ae81c038d0926f0c3e0747a61764