added the page functions
fixed conflicts
everything works
final commission