now included fixes for em