demo improvements