Updated program and todo