took care of TODOs