Dealt with various TO DOs