Added Emily changes