Audrey

Changes to resolve bug issues