ADD simple methods and FIXED some bugs.