moved arugments hack to options