change on 140314

some improvments