binary update; issues resolved by Tuan from last commit