Add specific rules, improve points count