X64

min changes + min tests