Added RR and fixed SJFP