Fixes and new method added