Added 200pts rule, more refactory