personal todo comment removed :P