finishes merging yanick's example