merging binaca's changes