added quotes
moved some sections