updated for 10.3

this is the 10.3 file with changes made for 10.2 merged to it.