Improved the index... but its still a fai;