Export working again