latest prototype with mock support