more updates to put it all together