Added new adapted methods, and some fixs