Bringing in louisa's changes