added more of roisins changes