Improving WorkFlow