a bit of houskeeping…. hope all still works