more updates... again based on old redundant demos