Can remove the todo comment now