-modyfied methods
-tests