Brought up to date to work with latest psybrus on my dev branch