Many new routines to handle internal storage