Moar Janice fine tuning

Change-Id: I41aef33d1aa53c26850091a0aaa19eb22e533b45