Resolved todo