Updated with completed replacement of numbers

now working on Questions