incorporating Daan's remakrs