extend todo
remove debug code in class