removed red lines; last work for shortlist
Merge remote-tracking branch 'origin/master'