Recommendations

based on WAR 24