Updated rules, removed short messages