Makeing adjustments form code review from Jason