Recommendations

based on CR NO: 89