adjusted indexing + new binaries - doesn't quite work yet