added page 2 and updated links
fixed conflict