Made Eric's recommended changes