TODO added

Bad programming style