updates to this forgot to merge