It works (I hope) - properly this time