Changes to improve initial poor design