Not using the singleton instance anymore
Trying to fix errors when this is run on linux