codes updated to add more data