add new methods + some tests