it might be working for bothnow, need to run more tests