Updated for linux64