Demo build, updated for smoothness