Added Upload Check (will need to refactor)