updated to 30 page working