tweaks to start getting this working again