07072014_update_1: TODO comments