Changes for new Alfred id158+159