update to some of the code