Removed use of pre-initialized global data in this file as it was causing problems...