Finished TODO from previous commit