Updated info and todo