#162. Functional implemented. Some fixes applied to helper.