Merging SJF with Master (Manual)

Merging Rich's SJF changes with Master