Fixed method call. Erased TODOs.