Added //TODO notations