Gotten rid of globals.