Chnages to core and todo