Way more changes thanks to #python