Had to optimize my storage---------