Merging hollys changes