Fix Business Problems

Fix Business Problems