Slowly moving to x86_64