Some fixes, new method and new class.