Mo better ps

Change-Id: I296ea18dbd601f18fe7367b42bf5aecd9ccf9646