More bussines rules
More bussines rules. And more possible Bug