Make this not need updating all the time