even more updates, some of latest iteration