change some emma stuff