changes to things with scan f couldn't figure out