Added final changes based on just grepping.