recommendations by xabbuh
fixed merge