moved the TODO above the return statement