(merge) dev page one