updated code todo's