Added more add on , not finished. has out of index error