UPD: skillz
FIX: as per comment
Merge branch 'deadly_skills'