Recommendations

based on SDDE-707