Switched to g++