Updated, but probably not improved design