minimum changes so it works