bluesky404's updates for both files