more work on data page