added options, tested in network