updates

needed to merge the branches