Recommendations

based on the fix