now uses data instead of files - could try both at school