GAV-34: fixed sample, unfinished work