I've done some changes to index