Recommendations

based on SDDE-563