Replaced old completion model