Changed demo a little