updating to prep for threading