simplify methods again, don't find the destination twice.