fixed and added more data