ticket:9 updates for getbarista - some test patch