Change to machine specific code to prevent sync issues