Rework things

Change-Id: I2c0d42dd84bced0aa7f2b21693f6426cdb870cd1