some new updates to put it all together