* loader improvment
* merge