add better star support