Adapted fetch method

working on #6