Updated storage and cleand up.