Tested updates, still need to clean up