Updated and passing cibuild