Added warning, changed name and updated todo