Made changes per Riggins instruction