Updated completion script