Better find, and student upload