more updates to not use binaries