Updated the conversions. Moving maps over