edited dev_0.1