added more demo features