made some demos better