Processed Oscar's review comments