Shashlik geometry v2

Checked against 2014-04-1400 IB