Original files - Task 10502 & 10436 -2