Mod of calzonesman's sync repo