Strategy revised, some other (minor) changes