modified some sections but I am not done yet