Feature/annotate download part2

This `return` will never get called