Maybe simpler, not sure