updates to get it all working