fixed after messing up merge conflict
fixed after messing up merge conflict

dcastil1983/UCRcareer,CrazyWearsPJs/UCRcareer,dcastil1983/UCRcareer,dcastil1983/UCRcareer,CrazyWearsPJs/UCRcareer,CrazyWearsPJs/UCRcareer,dcastil1983/UCRcareer,CrazyWearsPJs/UCRcareer