Bringing in changes from louisa-bielig