Changed demo loop