Adding map back small to debug some