Recommendations

based on DEV-18