implemented more of data