Added sample + same fixes.