Improved basesaving