Added from class. Still to be fully tested.