better storage sturcture