upgraded rulesystem