custom additions

Change-Id: Ic1f58f64b4b5b2025a3cf6a4c2f7feca9e173c18