removed debug and added TODO