Add adaptiveness to demo