getting rid of TODO