Feature/annotate download part2