Changed template back to original and added todonotes