[violin] some modifications
resolved merge conflict for violin.py