Changed storage size to be more comprehensive