now with new config (thanks @jerith)