removed TODOs
final version for submission
final version for submission