making script work again after merging