Current index saves. Close #18