kill this TODO since itis done