minor changes; removed request dependency