Fixed Demo Issues

Changed demo to use 'match' signature