more changes and preparation for work on jumps index