need to work on data orgnization