made a few tweaks on source branch