Got rid of TODO cos it was annoying